From 69aa0f8eedb2b2115eadfa6c31939aa5ad2a3c96 Mon Sep 17 00:00:00 2001
From: Carsten Ziegeler <cziegeler@apache.org>
Date: Mon, 10 Apr 2006 11:32:10 +0000
Subject: [PATCH] Add some blocks to build

git-svn-id: https://svn.apache.org/repos/asf/cocoon/trunk/blocks/cocoon-apples@392923 13f79535-47bb-0310-9956-ffa450edef68
---
 cocoon-apples-impl/pom.xml                    |  2 +-
 .../flow/apples/ApplesProcessor.java          | 23 ++++---------------
 cocoon-apples-sample/pom.xml                  |  2 +-
 pom.xml                                       |  4 ++--
 4 files changed, 8 insertions(+), 23 deletions(-)

diff --git a/cocoon-apples-impl/pom.xml b/cocoon-apples-impl/pom.xml
index a37aa344213..7c6225874e5 100755
--- a/cocoon-apples-impl/pom.xml
+++ b/cocoon-apples-impl/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-apples</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>1-SNAPSHOT</version>
   </parent>
   
   <modelVersion>4.0.0</modelVersion>
diff --git a/cocoon-apples-impl/src/main/java/org/apache/cocoon/components/flow/apples/ApplesProcessor.java b/cocoon-apples-impl/src/main/java/org/apache/cocoon/components/flow/apples/ApplesProcessor.java
index 3470de15a1e..30a05681ab6 100644
--- a/cocoon-apples-impl/src/main/java/org/apache/cocoon/components/flow/apples/ApplesProcessor.java
+++ b/cocoon-apples-impl/src/main/java/org/apache/cocoon/components/flow/apples/ApplesProcessor.java
@@ -19,12 +19,9 @@
 
 import org.apache.avalon.framework.CascadingRuntimeException;
 import org.apache.avalon.framework.activity.Disposable;
-import org.apache.avalon.framework.component.WrapperComponentManager;
 import org.apache.avalon.framework.context.ContextException;
 import org.apache.avalon.framework.context.DefaultContext;
-import org.apache.avalon.framework.service.ServiceException;
 import org.apache.avalon.framework.service.ServiceManager;
-import org.apache.avalon.framework.service.Serviceable;
 import org.apache.cocoon.components.ContextHelper;
 import org.apache.cocoon.components.LifecycleHelper;
 import org.apache.cocoon.components.flow.AbstractInterpreter;
@@ -39,11 +36,9 @@
  * ApplesProcessor is the core Cocoon component that provides the 'Apples' 
  * flow implementation. 
  */
-public class ApplesProcessor extends AbstractInterpreter implements Serviceable, ContinuationsDisposer {
-
-
-    private ServiceManager serviceManager;
-
+public class ApplesProcessor
+    extends AbstractInterpreter
+    implements ContinuationsDisposer {
 
     public void callFunction(
         String className,
@@ -74,9 +69,7 @@ public void callFunction(
             throw new CascadingRuntimeException("Cannot get sitemap service manager", e);
         }
 
-        LifecycleHelper.setupComponent( app, getLogger(), appleContext,
-                                        sitemapManager, new WrapperComponentManager(sitemapManager),
-                                        null, null, true);
+        LifecycleHelper.setupComponent( app, getLogger(), appleContext, sitemapManager, null, true);
         
         processApple(params, redirector, app, wk);
     }
@@ -171,12 +164,4 @@ public void disposeContinuation(WebContinuation webContinuation) {
         }
 
     }
-
-
-    public void service(ServiceManager serviceManager) throws ServiceException {
-        super.service(serviceManager);
-        this.serviceManager = serviceManager;
-    }
-
-
 }
diff --git a/cocoon-apples-sample/pom.xml b/cocoon-apples-sample/pom.xml
index 6004306be90..389541321d7 100755
--- a/cocoon-apples-sample/pom.xml
+++ b/cocoon-apples-sample/pom.xml
@@ -27,7 +27,7 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-apples</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>1-SNAPSHOT</version>
   </parent>
   
   <groupId>org.apache.cocoon</groupId>
diff --git a/pom.xml b/pom.xml
index 14c4a175566..26fa00e5480 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,14 +25,14 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-blocks-modules</artifactId>
-    <version>x-SNAPSHOT</version>
+    <version>1-SNAPSHOT</version>
   </parent>
   
   <modelVersion>4.0.0</modelVersion>
   
   <groupId>org.apache.cocoon</groupId>
   <artifactId>cocoon-apples</artifactId>
-  <version>1.0.0-SNAPSHOT</version>
+  <version>1-SNAPSHOT</version>
     
   <packaging>pom</packaging>