cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r614299 - in /cocoon/trunk/blocks/cocoon-portal: cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/adapter/impl/ cocoon-portal-sitemap/src/main/java/org/apache/cocoon/portal/coplet/adapter/impl/
Date Tue, 22 Jan 2008 19:46:21 GMT
Author: cziegeler
Date: Tue Jan 22 11:46:21 2008
New Revision: 614299

URL: http://svn.apache.org/viewvc?rev=614299&view=rev
Log:
Remove dependencies to Cocoon classes.

Modified:
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/adapter/impl/AbstractCopletAdapter.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sitemap/src/main/java/org/apache/cocoon/portal/coplet/adapter/impl/CocoonCopletAdapter.java

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/adapter/impl/AbstractCopletAdapter.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/adapter/impl/AbstractCopletAdapter.java?rev=614299&r1=614298&r2=614299&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/adapter/impl/AbstractCopletAdapter.java
(original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/adapter/impl/AbstractCopletAdapter.java
Tue Jan 22 11:46:21 2008
@@ -24,7 +24,6 @@
 import java.util.List;
 import java.util.Map;
 
-import org.apache.cocoon.environment.CocoonRunnable;
 import org.apache.cocoon.portal.PortalException;
 import org.apache.cocoon.portal.event.CopletInstanceEvent;
 import org.apache.cocoon.portal.event.Receiver;
@@ -226,7 +225,7 @@
                 if ( timeout != null ) {
                     final int milli = timeout.intValue() * 1000;
                     final LoaderThread loader = new LoaderThread(this, coplet, buffer);
-                    this.runnableManager.execute( new CocoonRunnable(loader) );
+                    this.runnableManager.execute( this.getLoaderRunnable(loader) );
                     try {
                         read = loader.join( milli );
                     } catch (InterruptedException ignore) {
@@ -484,6 +483,10 @@
             }
         }
         return buffer.toString();
+    }
+
+    protected Runnable getLoaderRunnable(Runnable loader) {
+        return loader;
     }
 }
 

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sitemap/src/main/java/org/apache/cocoon/portal/coplet/adapter/impl/CocoonCopletAdapter.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sitemap/src/main/java/org/apache/cocoon/portal/coplet/adapter/impl/CocoonCopletAdapter.java?rev=614299&r1=614298&r2=614299&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sitemap/src/main/java/org/apache/cocoon/portal/coplet/adapter/impl/CocoonCopletAdapter.java
(original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sitemap/src/main/java/org/apache/cocoon/portal/coplet/adapter/impl/CocoonCopletAdapter.java
Tue Jan 22 11:46:21 2008
@@ -25,6 +25,7 @@
 import org.apache.cocoon.components.notification.Notifying;
 import org.apache.cocoon.components.notification.NotifyingBuilder;
 import org.apache.cocoon.components.source.SourceUtil;
+import org.apache.cocoon.environment.CocoonRunnable;
 import org.apache.cocoon.environment.ObjectModelHelper;
 import org.apache.cocoon.portal.om.CopletInstance;
 import org.apache.cocoon.portal.om.CopletInstanceFeatures;
@@ -160,5 +161,12 @@
         }
 
         return false;
+    }
+
+    /**
+     * @see org.apache.cocoon.portal.coplet.adapter.impl.AbstractCopletAdapter#getLoaderRunnable(java.lang.Runnable)
+     */
+    protected Runnable getLoaderRunnable(Runnable loader) {
+        return new CocoonRunnable(loader);
     }
 }



Mime
View raw message