Return-Path: 
 <cvs-return-33174-apmail-cocoon-cvs-archive=cocoon.apache.org@cocoon.apache.org>
Delivered-To: apmail-cocoon-cvs-archive@www.apache.org
Received: (qmail 22097 invoked from network); 14 Apr 2008 15:41:23 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 14 Apr 2008 15:41:23 -0000
Received: (qmail 25813 invoked by uid 500); 14 Apr 2008 15:41:23 -0000
Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org
Received: (qmail 25763 invoked by uid 500); 14 Apr 2008 15:41:23 -0000
Mailing-List: contact cvs-help@cocoon.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@cocoon.apache.org
list-help: <mailto:cvs-help@cocoon.apache.org>
list-unsubscribe: <mailto:cvs-unsubscribe@cocoon.apache.org>
List-Post: <mailto:cvs@cocoon.apache.org>
List-Id: <cvs.cocoon.apache.org>
Delivered-To: mailing list cvs@cocoon.apache.org
Received: (qmail 25752 invoked by uid 99); 14 Apr 2008 15:41:23 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 14 Apr 2008 08:41:23 -0700
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 14 Apr 2008 15:40:37 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 59B591A9832; Mon, 14 Apr 2008 08:40:56 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r647856 - in
 /cocoon/whiteboard/corona/trunk/corona-servlet: ./
 src/main/java/org/apache/cocoon/corona/servlet/component/
 src/main/resources/COB-INF/ src/main/resources/META-INF/cocoon/spring/
 src/test/java/org/apache/cocoon/corona/sitemap/
Date: Mon, 14 Apr 2008 15:40:54 -0000
To: cvs@cocoon.apache.org
From: reinhard@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20080414154056.59B591A9832@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: reinhard
Date: Mon Apr 14 08:40:50 2008
New Revision: 647856

URL: http://svn.apache.org/viewvc?rev=647856&view=rev
Log:
. move controller implementation into a separate module

Removed:
    cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/cocoon/corona/servlet/component/Controller.java
    cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/cocoon/corona/servlet/component/DefaultControllerComponent.java
Modified:
    cocoon/whiteboard/corona/trunk/corona-servlet/pom.xml
    cocoon/whiteboard/corona/trunk/corona-servlet/rcl.properties
    cocoon/whiteboard/corona/trunk/corona-servlet/src/main/resources/COB-INF/sitemap.xmap
    cocoon/whiteboard/corona/trunk/corona-servlet/src/main/resources/META-INF/cocoon/spring/corona-servlet-component.xml
    cocoon/whiteboard/corona/trunk/corona-servlet/src/test/java/org/apache/cocoon/corona/sitemap/SitemapBuilderTest.java

Modified: cocoon/whiteboard/corona/trunk/corona-servlet/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-servlet/pom.xml?rev=647856&r1=647855&r2=647856&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-servlet/pom.xml (original)
+++ cocoon/whiteboard/corona/trunk/corona-servlet/pom.xml Mon Apr 14 08:40:50 2008
@@ -41,6 +41,10 @@
       <groupId>org.apache.cocoon</groupId>
       <artifactId>corona-sitemap</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.apache.cocoon</groupId>
+      <artifactId>corona-controller</artifactId>
+    </dependency>
 
 <!-- 
     <dependency>
@@ -98,6 +102,7 @@
         <artifactId>cocoon-maven-plugin</artifactId>
         <configuration>
           <webappProfile>ssf</webappProfile>
+          <!-- reloadingClassLoaderEnabled>false</reloadingClassLoaderEnabled-->
         </configuration>
       </plugin>
       <plugin>

Modified: cocoon/whiteboard/corona/trunk/corona-servlet/rcl.properties
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-servlet/rcl.properties?rev=647856&r1=647855&r2=647856&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-servlet/rcl.properties (original)
+++ cocoon/whiteboard/corona/trunk/corona-servlet/rcl.properties Mon Apr 14 08:40:50 2008
@@ -20,6 +20,10 @@
 #%classes-dir=../corona-core/target/classes
 #%exclude-lib=org.apache.cocoon:corona-core
 
+# Cocoon Corona Controller
+%classes-dir=../corona-controller/target/classes
+%exclude-lib=org.apache.cocoon:corona-controller
+
 # Cocoon Corona Sitemap
 #%classes-dir=../corona-sitemap/target/classes
 #%exclude-lib=org.apache.cocoon:corona-sitemap

Modified: cocoon/whiteboard/corona/trunk/corona-servlet/src/main/resources/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-servlet/src/main/resources/COB-INF/sitemap.xmap?rev=647856&r1=647855&r2=647856&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-servlet/src/main/resources/COB-INF/sitemap.xmap (original)
+++ cocoon/whiteboard/corona/trunk/corona-servlet/src/main/resources/COB-INF/sitemap.xmap Mon Apr 14 08:40:50 2008
@@ -1,8 +1,25 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you 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.
+ -->
+<!-- $Id$ -->
 <map:sitemap xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:map="http://apache.org/cocoon/corona/sitemap"
-  xmlns:servlet="http://apache.org/cocoon/corona/servlet">
-
-  <map:flow language="it-controller" />
+  xmlns:servlet="http://apache.org/cocoon/corona/servlet" xmlns:controller="http://apache.org/cocoon/corona/controller">
 
   <map:pipelines>
     <!-- ~~~~~~~~~~~~~~~~ exemplary image pipelines ~~~~~~~~~~~~~~~ -->
@@ -177,10 +194,7 @@
     <!-- ~~~~~~~~~~~~~~~~ controller ~~~~~~~~~~~~~~~ -->
     <map:pipeline id="controller">
       <map:match pattern="controller/invoke">
-        <map:call function="any-function" />
-      </map:match>
-      <map:match pattern="controller/continue">
-        <map:call continuation="any-continuation" />
+        <controller:call controller="demo" select="org.apache.cocoon.corona.controller.sample.DemoController" />
       </map:match>
     </map:pipeline>
 

Modified: cocoon/whiteboard/corona/trunk/corona-servlet/src/main/resources/META-INF/cocoon/spring/corona-servlet-component.xml
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-servlet/src/main/resources/META-INF/cocoon/spring/corona-servlet-component.xml?rev=647856&r1=647855&r2=647856&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-servlet/src/main/resources/META-INF/cocoon/spring/corona-servlet-component.xml (original)
+++ cocoon/whiteboard/corona/trunk/corona-servlet/src/main/resources/META-INF/cocoon/spring/corona-servlet-component.xml Mon Apr 14 08:40:50 2008
@@ -26,6 +26,4 @@
 
   <bean name="generator:request-parameters" class="org.apache.cocoon.corona.servlet.component.RequestParametersGenerator" scope="prototype" />
 
-  <bean name="controller:default" class="org.apache.cocoon.corona.servlet.component.DefaultControllerComponent" scope="prototype" />
-
 </beans>

Modified: cocoon/whiteboard/corona/trunk/corona-servlet/src/test/java/org/apache/cocoon/corona/sitemap/SitemapBuilderTest.java
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-servlet/src/test/java/org/apache/cocoon/corona/sitemap/SitemapBuilderTest.java?rev=647856&r1=647855&r2=647856&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-servlet/src/test/java/org/apache/cocoon/corona/sitemap/SitemapBuilderTest.java (original)
+++ cocoon/whiteboard/corona/trunk/corona-servlet/src/test/java/org/apache/cocoon/corona/sitemap/SitemapBuilderTest.java Mon Apr 14 08:40:50 2008
@@ -95,11 +95,12 @@
                 invocation.getThrowable() instanceof NoMatchingPipelineException);
     }
 
+
     public void testController() {
         Invocation invocation = this.buildInvocation("controller/invoke");
-        InvocationResult invocationResult = this.sitemap.invoke(invocation);
-
+        InvocationResult invocationResult = sitemap.invoke(invocation);
         assertNotNull(invocationResult);
+        assertTrue(invocationResult.isCompleted());
     }
 
     public void testXSLT() {
@@ -188,7 +189,8 @@
                 "META-INF/cocoon/spring/applicationContext.xml", "META-INF/cocoon/spring/corona-pipeline-action.xml",
                 "META-INF/cocoon/spring/corona-pipeline-component.xml", "META-INF/cocoon/spring/corona-pipeline.xml",
                 "META-INF/cocoon/spring/corona-sitemap-node.xml", "META-INF/cocoon/spring/corona-expression-language.xml",
-                "META-INF/cocoon/spring/corona-servlet-node.xml", "META-INF/cocoon/spring/corona-servlet-component.xml"});
+                "META-INF/cocoon/spring/corona-servlet-node.xml", "META-INF/cocoon/spring/corona-servlet-component.xml",
+                "META-INF/cocoon/spring/corona-controller.xml"});
 
         this.componentProvider = (ComponentProvider) applicationContext.getBean("org.apache.cocoon.corona.sitemap.ComponentProvider");