cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r470999 - in /cocoon/trunk/core/cocoon-core/src/main: java/org/apache/cocoon/components/fam/ java/org/apache/cocoon/components/treeprocessor/sitemap/ java/org/apache/cocoon/core/container/spring/avalon/ resources/org/apache/cocoon/
Date Fri, 03 Nov 2006 21:22:34 GMT
Author: cziegeler
Date: Fri Nov  3 13:22:33 2006
New Revision: 470999

URL: http://svn.apache.org/viewvc?view=rev&rev=470999
Log:
Rename to more general classes

Added:
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/fam/MonitorImpl.java
      - copied, changed from r470937, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/fam/SitemapMonitorImpl.java
Removed:
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/fam/SitemapMonitorImpl.java
Modified:
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/treeprocessor/sitemap/SitemapLanguage.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/SitemapHelper.java
    cocoon/trunk/core/cocoon-core/src/main/resources/org/apache/cocoon/cocoon.roles

Copied: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/fam/MonitorImpl.java
(from r470937, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/fam/SitemapMonitorImpl.java)
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/fam/MonitorImpl.java?view=diff&rev=470999&p1=cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/fam/SitemapMonitorImpl.java&r1=470937&p2=cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/fam/MonitorImpl.java&r2=470999
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/fam/SitemapMonitorImpl.java
(original)
+++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/fam/MonitorImpl.java
Fri Nov  3 13:22:33 2006
@@ -22,8 +22,8 @@
 import org.apache.avalon.framework.activity.Initializable;
 import org.apache.avalon.framework.logger.AbstractLogEnabled;
 import org.apache.avalon.framework.thread.ThreadSafe;
-import org.apache.cocoon.classloader.SitemapNotifierStore;
-import org.apache.cocoon.classloader.fam.SitemapMonitor;
+import org.apache.cocoon.classloader.NotifyingResourceStore;
+import org.apache.cocoon.classloader.fam.Monitor;
 import org.apache.commons.jci.listeners.NotificationListener;
 import org.apache.commons.jci.listeners.ReloadingListener;
 import org.apache.commons.jci.monitor.FilesystemAlterationListener;
@@ -32,9 +32,9 @@
 /**
  * @version $Id$
  */
-public final class SitemapMonitorImpl 
+public final class MonitorImpl 
     extends AbstractLogEnabled 
-    implements SitemapMonitor, ThreadSafe, Initializable, Disposable {
+    implements Monitor, ThreadSafe, Initializable, Disposable {
 
     private FilesystemAlterationMonitor monitor;
     private NotificationListener sitemapNotifier;
@@ -58,19 +58,19 @@
     }
 
     /**
-     * @see org.apache.cocoon.classloader.fam.SitemapMonitor#subscribe(org.apache.commons.jci.monitor.FilesystemAlterationListener)
+     * @see org.apache.cocoon.classloader.fam.Monitor#subscribe(org.apache.commons.jci.monitor.FilesystemAlterationListener)
      */
     public void subscribe(final FilesystemAlterationListener listener) {
         this.monitor.addListener(listener);
-        this.monitor.addListener(new ReloadingListener(listener.getRepository(),new SitemapNotifierStore(this.sitemapNotifier)));
+        this.monitor.addListener(new ReloadingListener(listener.getRepository(),new NotifyingResourceStore(this.sitemapNotifier)));
     }
 
     /**
-     * @see org.apache.cocoon.components.fam.SitemapMonitor#unsubscribe(org.apache.commons.jci.monitor.FilesystemAlterationListener)
+     * @see org.apache.cocoon.components.fam.Monitor#unsubscribe(org.apache.commons.jci.monitor.FilesystemAlterationListener)
      */
     public void unsubscribe(final FilesystemAlterationListener listener) {
         this.monitor.removeListener(listener);
-        this.monitor.removeListener(new ReloadingListener(listener.getRepository(),new SitemapNotifierStore(this.sitemapNotifier)));
+        this.monitor.removeListener(new ReloadingListener(listener.getRepository(),new NotifyingResourceStore(this.sitemapNotifier)));
     }
     
     public void setSitemapNotifier(NotificationListener sitemapNotifier) {

Modified: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/treeprocessor/sitemap/SitemapLanguage.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/treeprocessor/sitemap/SitemapLanguage.java?view=diff&rev=470999&r1=470998&r2=470999
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/treeprocessor/sitemap/SitemapLanguage.java
(original)
+++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/treeprocessor/sitemap/SitemapLanguage.java
Fri Nov  3 13:22:33 2006
@@ -45,7 +45,7 @@
 import org.apache.avalon.framework.service.Serviceable;
 import org.apache.cocoon.Constants;
 import org.apache.cocoon.ProcessingUtil;
-import org.apache.cocoon.classloader.fam.SitemapMonitor;
+import org.apache.cocoon.classloader.fam.Monitor;
 import org.apache.cocoon.components.LifecycleHelper;
 import org.apache.cocoon.components.source.SourceUtil;
 import org.apache.cocoon.components.treeprocessor.AbstractProcessingNode;
@@ -335,7 +335,7 @@
      * Build a processing tree from a <code>Configuration</code>.
      */
     public ProcessingNode build(Configuration tree, String location) throws Exception {
-        final SitemapMonitor fam = (SitemapMonitor) this.manager.lookup(SitemapMonitor.ROLE);
+        final Monitor fam = (Monitor) this.manager.lookup(Monitor.ROLE);
         fam.setSitemapNotifier(this.processor.getWrappingProcessor());
         this.itsContainer = SitemapHelper.createContainer(
                                                tree,

Modified: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/SitemapHelper.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/SitemapHelper.java?view=diff&rev=470999&r1=470998&r2=470999
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/SitemapHelper.java
(original)
+++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/SitemapHelper.java
Fri Nov  3 13:22:33 2006
@@ -27,7 +27,7 @@
 import org.apache.avalon.framework.configuration.DefaultConfiguration;
 import org.apache.cocoon.classloader.ClassLoaderConfiguration;
 import org.apache.cocoon.classloader.ClassLoaderFactory;
-import org.apache.cocoon.classloader.fam.SitemapMonitor;
+import org.apache.cocoon.classloader.fam.Monitor;
 import org.apache.cocoon.core.container.spring.CocoonRequestAttributes;
 import org.apache.cocoon.core.container.spring.CocoonWebApplicationContext;
 import org.apache.cocoon.core.container.spring.Container;
@@ -142,7 +142,7 @@
 
     public static Container createContainer(Configuration  config,
                                             String         sitemapLocation,
-                                            SitemapMonitor fam,
+                                            Monitor fam,
                                             ServletContext servletContext)
     throws Exception {
         // let's get the root container first
@@ -188,7 +188,7 @@
      */
     protected static ClassLoader createClassLoader(BeanFactory    parentFactory,
                                                    Configuration  config,
-                                                   SitemapMonitor fam,
+                                                   Monitor fam,
                                                    ServletContext servletContext,
                                                    SourceResolver sitemapResolver)
     throws Exception {
@@ -207,7 +207,7 @@
 
         // Create a new classloader
         ClassLoaderConfiguration configBean = AvalonUtils.createConfiguration(sitemapResolver,
classPathConfig);
-        configBean.setSitemapMonitor(fam);
+        configBean.setMonitor(fam);
         ClassLoaderFactory clFactory = (ClassLoaderFactory)parentFactory.getBean(factoryRole);
         return clFactory.createClassLoader(Thread.currentThread().getContextClassLoader(),
                                            configBean,

Modified: cocoon/trunk/core/cocoon-core/src/main/resources/org/apache/cocoon/cocoon.roles
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/resources/org/apache/cocoon/cocoon.roles?view=diff&rev=470999&r1=470998&r2=470999
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/resources/org/apache/cocoon/cocoon.roles (original)
+++ cocoon/trunk/core/cocoon-core/src/main/resources/org/apache/cocoon/cocoon.roles Fri Nov
 3 13:22:33 2006
@@ -182,9 +182,9 @@
         model="non-thread-safe-pooled"/>
 	
   <!--=========================================================================-->
-  <role name="org.apache.cocoon.classloader.fam.SitemapMonitor"
+  <role name="org.apache.cocoon.classloader.fam.Monitor"
         shorthand="fam"
-        default-class="org.apache.cocoon.components.fam.SitemapMonitorImpl"/>
+        default-class="org.apache.cocoon.components.fam.MonitorImpl"/>
 
   <role name="org.apache.excalibur.xmlizer.XMLizer"
         shorthand="xmlizer"



Mime
View raw message