svn commit: r408639 - in /lenya/trunk/src/java/org/apache/lenya: cms/cocoon/source/FallbackSourceFactory.java cms/cocoon/source/TemplateFallbackSourceFactory.java transaction/AbstractOperation.java transaction/Operation.java

Author: andreas
Date: Mon May 22 03:54:59 2006
New Revision: 408639

URL: http://svn.apache.org/viewvc?rev=408639&view=rev
Log:
Removed obsolete Operation interface + implementation

Removed:
    lenya/trunk/src/java/org/apache/lenya/transaction/AbstractOperation.java
    lenya/trunk/src/java/org/apache/lenya/transaction/Operation.java
Modified:
    
lenya/trunk/src/java/org/apache/lenya/cms/cocoon/source/FallbackSourceFactory.java
    
lenya/trunk/src/java/org/apache/lenya/cms/cocoon/source/TemplateFallbackSourceFactory.java

Modified: 
lenya/trunk/src/java/org/apache/lenya/cms/cocoon/source/FallbackSourceFactory.java
URL: 
http://svn.apache.org/viewvc/lenya/trunk/src/java/org/apache/lenya/cms/cocoon/source/FallbackSourceFactory.java?rev=408639&r1=408638&r2=408639&view=diff
==============================================================================
--- 
lenya/trunk/src/java/org/apache/lenya/cms/cocoon/source/FallbackSourceFactory.java
 (original)
+++ 
lenya/trunk/src/java/org/apache/lenya/cms/cocoon/source/FallbackSourceFactory.java
 Mon May 22 03:54:59 2006
@@ -25,6 +25,7 @@
 
 import org.apache.avalon.framework.context.ContextException;
 import org.apache.avalon.framework.context.Contextualizable;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
 import org.apache.avalon.framework.service.ServiceException;
 import org.apache.avalon.framework.service.ServiceManager;
 import org.apache.avalon.framework.service.Serviceable;
@@ -40,14 +41,13 @@
 import org.apache.lenya.cms.publication.URLInformation;
 import org.apache.lenya.cms.publication.templating.ExistingSourceResolver;
 import org.apache.lenya.cms.publication.templating.PublicationTemplateManager;
-import org.apache.lenya.transaction.AbstractOperation;
 
 /**
  * Source factory following the fallback principle.
  * 
  * @version $Id$
  */
-public class FallbackSourceFactory extends AbstractOperation implements 
SourceFactory, Serviceable,
+public class FallbackSourceFactory extends AbstractLogEnabled implements 
SourceFactory, Serviceable,
         Contextualizable, URIAbsolutizer {
 
     /**
@@ -155,7 +155,6 @@
      * @see 
org.apache.avalon.framework.service.Serviceable#service(org.apache.avalon.framework.service.ServiceManager)
      */
     public void service(ServiceManager _manager) throws ServiceException {
-        super.service(_manager);
         this.manager = _manager;
     }
 

Modified: 
lenya/trunk/src/java/org/apache/lenya/cms/cocoon/source/TemplateFallbackSourceFactory.java
URL: 
http://svn.apache.org/viewvc/lenya/trunk/src/java/org/apache/lenya/cms/cocoon/source/TemplateFallbackSourceFactory.java?rev=408639&r1=408638&r2=408639&view=diff
==============================================================================
--- 
lenya/trunk/src/java/org/apache/lenya/cms/cocoon/source/TemplateFallbackSourceFactory.java
 (original)
+++ 
lenya/trunk/src/java/org/apache/lenya/cms/cocoon/source/TemplateFallbackSourceFactory.java
 Mon May 22 03:54:59 2006
@@ -25,6 +25,7 @@
 
 import org.apache.avalon.framework.context.ContextException;
 import org.apache.avalon.framework.context.Contextualizable;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
 import org.apache.avalon.framework.service.ServiceException;
 import org.apache.avalon.framework.service.ServiceManager;
 import org.apache.avalon.framework.service.Serviceable;
@@ -40,14 +41,13 @@
 import org.apache.lenya.cms.publication.URLInformation;
 import org.apache.lenya.cms.publication.templating.ExistingSourceResolver;
 import org.apache.lenya.cms.publication.templating.PublicationTemplateManager;
-import org.apache.lenya.transaction.AbstractOperation;
 
 /**
  * Source factory following the fallback principle.
  * 
  * @version $Id: FallbackSourceFactory.java 264153 2005-08-29 15:11:14Z 
andreas $
  */
-public class TemplateFallbackSourceFactory extends AbstractOperation 
implements SourceFactory, Serviceable,
+public class TemplateFallbackSourceFactory extends AbstractLogEnabled 
implements SourceFactory, Serviceable,
         Contextualizable, URIAbsolutizer {
 
     /**
@@ -161,7 +161,6 @@
      * @see 
org.apache.avalon.framework.service.Serviceable#service(org.apache.avalon.framework.service.ServiceManager)
      */
     public void service(ServiceManager _manager) throws ServiceException {
-        super.service(_manager);
         this.manager = _manager;
     }