Mailing-List: contact cvs-help@cocoon.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@cocoon.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r522844 - in /cocoon/trunk/blocks/cocoon-captcha: ./
 cocoon-captcha-impl/src/main/resources/META-INF/cocoon/avalon/
 cocoon-captcha-impl/src/main/resources/META-INF/cocoon/spring/
 cocoon-captcha-sample/ cocoon-captcha-sample/src/main/resourc...
Date: Tue, 27 Mar 2007 09:38:06 -0000
To: cvs@cocoon.apache.org
From: felixk@apache.org
Message-Id: <20070327093806.E26AF1A9846@eris.apache.org>

Author: felixk
Date: Tue Mar 27 02:38:05 2007
New Revision: 522844

URL: http://svn.apache.org/viewvc?view=rev&rev=522844
Log:
migrate avalon configuration to spring configuration

Added:
    cocoon/trunk/blocks/cocoon-captcha/cocoon-captcha-impl/src/main/resources/META-INF/cocoon/spring/
    cocoon/trunk/blocks/cocoon-captcha/cocoon-captcha-impl/src/main/resources/META-INF/cocoon/spring/cocoon-captcha-reader.xml   (with props)
    cocoon/trunk/blocks/cocoon-captcha/cocoon-captcha-sample/src/main/resources/COB-INF/flow/
    cocoon/trunk/blocks/cocoon-captcha/cocoon-captcha-sample/src/main/resources/COB-INF/flow/captcha.js   (with props)
    cocoon/trunk/blocks/cocoon-captcha/cocoon-captcha-sample/src/main/resources/META-INF/
    cocoon/trunk/blocks/cocoon-captcha/cocoon-captcha-sample/src/main/resources/META-INF/cocoon/
    cocoon/trunk/blocks/cocoon-captcha/cocoon-captcha-sample/src/main/resources/META-INF/cocoon/spring/
    cocoon/trunk/blocks/cocoon-captcha/cocoon-captcha-sample/src/main/resources/META-INF/cocoon/spring/cocoon-captcha-sample-blockServlet.xml   (with props)
    cocoon/trunk/blocks/cocoon-captcha/pom.xml   (with props)
Removed:
    cocoon/trunk/blocks/cocoon-captcha/cocoon-captcha-impl/src/main/resources/META-INF/cocoon/avalon/
    cocoon/trunk/blocks/cocoon-captcha/cocoon-captcha-sample/src/main/resources/COB-INF/captcha.js
Modified:
    cocoon/trunk/blocks/cocoon-captcha/cocoon-captcha-sample/pom.xml
    cocoon/trunk/blocks/cocoon-captcha/cocoon-captcha-sample/src/main/resources/COB-INF/sitemap.xmap

Added: cocoon/trunk/blocks/cocoon-captcha/cocoon-captcha-impl/src/main/resources/META-INF/cocoon/spring/cocoon-captcha-reader.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-captcha/cocoon-captcha-impl/src/main/resources/META-INF/cocoon/spring/cocoon-captcha-reader.xml?view=auto&rev=522844
==============================================================================
--- cocoon/trunk/blocks/cocoon-captcha/cocoon-captcha-impl/src/main/resources/META-INF/cocoon/spring/cocoon-captcha-reader.xml (added)
+++ cocoon/trunk/blocks/cocoon-captcha/cocoon-captcha-impl/src/main/resources/META-INF/cocoon/spring/cocoon-captcha-reader.xml Tue Mar 27 02:38:05 2007
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN"
+    "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!--
+  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.
+-->
+
+<!-- @version $Id$ -->
+
+<!--+
+    | Readers circumvent the XML oriented SAX pipeline model, think of a reader
+    | being a generator and a serializer at once thus a pipeline may not
+    | contain any generator, transformer or serializer in addition to a
+    | reader. They are useful for delivering binary content like images.
+    +-->
+<beans>
+  <bean name="org.apache.cocoon.reading.Reader/captcha"
+        class="org.apache.cocoon.reading.CaptchaReader"
+        scope="prototype">
+  </bean>
+</beans>
\ No newline at end of file

Propchange: cocoon/trunk/blocks/cocoon-captcha/cocoon-captcha-impl/src/main/resources/META-INF/cocoon/spring/cocoon-captcha-reader.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/trunk/blocks/cocoon-captcha/cocoon-captcha-impl/src/main/resources/META-INF/cocoon/spring/cocoon-captcha-reader.xml
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: cocoon/trunk/blocks/cocoon-captcha/cocoon-captcha-sample/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-captcha/cocoon-captcha-sample/pom.xml?view=diff&rev=522844&r1=522843&r2=522844
==============================================================================
--- cocoon/trunk/blocks/cocoon-captcha/cocoon-captcha-sample/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-captcha/cocoon-captcha-sample/pom.xml Tue Mar 27 02:38:05 2007
@@ -23,7 +23,6 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
   <modelVersion>4.0.0</modelVersion>
-  <version>1.0.0-SNAPSHOT</version>
   
   <parent>
     <artifactId>cocoon-blocks-modules</artifactId>
@@ -31,7 +30,9 @@
     <version>4-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>    
   </parent>
+
   <artifactId>cocoon-captcha-sample</artifactId>
+  <version>1.0.0-SNAPSHOT</version>
   <packaging>jar</packaging>
   <name>Cocoon Captcha Block Sample</name>
 

Added: cocoon/trunk/blocks/cocoon-captcha/cocoon-captcha-sample/src/main/resources/COB-INF/flow/captcha.js
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-captcha/cocoon-captcha-sample/src/main/resources/COB-INF/flow/captcha.js?view=auto&rev=522844
==============================================================================
--- cocoon/trunk/blocks/cocoon-captcha/cocoon-captcha-sample/src/main/resources/COB-INF/flow/captcha.js (added)
+++ cocoon/trunk/blocks/cocoon-captcha/cocoon-captcha-sample/src/main/resources/COB-INF/flow/captcha.js Tue Mar 27 02:38:05 2007
@@ -0,0 +1,51 @@
+/*
+* 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.
+*/
+function passcode(length) {
+  var alphabet = [ 'a', 'a', 'a', 'b', 'c', 'd', 'e', 'e', 'e', 'f', 'g', 'h', 'i',
+                   'i', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'o', 'o', 'p', 'q', 'r',
+                   's', 't', 'u', 'u', 'u', 'v', 'w', 'x', 'y', 'z' ]; 
+
+  var result = "";
+  for (var x = 0; x < length; x++) {
+    var offset = Math.random() * alphabet.length;
+    result += alphabet[Math.floor(offset)];
+  }
+  return result;
+} 
+
+function simple() {
+  var session = cocoon.session;
+
+  session.setAttribute("captcha", passcode(7));
+  cocoon.sendPageAndWait("simple.jx");
+  var parameters = null;
+
+  while (true) {
+    parameters = {
+      "supplied": cocoon.request["captcha"],
+      "expected": session.getAttribute("captcha"),
+    };
+
+    if (parameters['supplied'].equals(parameters['expected'])) break;
+
+    session.setAttribute("captcha", passcode(7));
+    cocoon.sendPageAndWait("simple-failure.jx", parameters);
+  }
+
+  session.invalidate();
+  cocoon.sendPageAndWait("simple-success.jx", parameters);
+}

Propchange: cocoon/trunk/blocks/cocoon-captcha/cocoon-captcha-sample/src/main/resources/COB-INF/flow/captcha.js
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/trunk/blocks/cocoon-captcha/cocoon-captcha-sample/src/main/resources/COB-INF/flow/captcha.js
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: cocoon/trunk/blocks/cocoon-captcha/cocoon-captcha-sample/src/main/resources/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-captcha/cocoon-captcha-sample/src/main/resources/COB-INF/sitemap.xmap?view=diff&rev=522844&r1=522843&r2=522844
==============================================================================
--- cocoon/trunk/blocks/cocoon-captcha/cocoon-captcha-sample/src/main/resources/COB-INF/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-captcha/cocoon-captcha-sample/src/main/resources/COB-INF/sitemap.xmap Tue Mar 27 02:38:05 2007
@@ -30,9 +30,7 @@
     </map:generators>
   </map:components>
   
-  <map:flow language="javascript">
-    <map:script src="captcha.js"/>
-  </map:flow>
+  <map:flow language="javascript" />
 
   <map:pipelines>
     <map:pipeline type="caching">
@@ -81,7 +79,8 @@
       </map:match>
       
       <map:match pattern="**.jx">
-        <map:generate type="jx" src="{1}.jx"/>
+        <map:generate src="{1}.jx"/>
+        <map:transform type="jx" />
         <map:serialize type="html"/>
       </map:match>
       

Added: cocoon/trunk/blocks/cocoon-captcha/cocoon-captcha-sample/src/main/resources/META-INF/cocoon/spring/cocoon-captcha-sample-blockServlet.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-captcha/cocoon-captcha-sample/src/main/resources/META-INF/cocoon/spring/cocoon-captcha-sample-blockServlet.xml?view=auto&rev=522844
==============================================================================
--- cocoon/trunk/blocks/cocoon-captcha/cocoon-captcha-sample/src/main/resources/META-INF/cocoon/spring/cocoon-captcha-sample-blockServlet.xml (added)
+++ cocoon/trunk/blocks/cocoon-captcha/cocoon-captcha-sample/src/main/resources/META-INF/cocoon/spring/cocoon-captcha-sample-blockServlet.xml Tue Mar 27 02:38:05 2007
@@ -0,0 +1,29 @@
+<?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.
+-->
+
+<!-- @version $Id$ -->
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:servlet="http://cocoon.apache.org/schema/servlet"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+                           http://cocoon.apache.org/schema/servlet http://cocoon.apache.org/schema/servlet/cocoon-servlet-1.0.xsd">
+
+    <bean id="org.apache.cocoon.captcha.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
+        <servlet:context mount-path="/cocoon-captcha-sample" context-path="blockcontext:/cocoon-captcha-sample/"/>
+    </bean>
+</beans>

Propchange: cocoon/trunk/blocks/cocoon-captcha/cocoon-captcha-sample/src/main/resources/META-INF/cocoon/spring/cocoon-captcha-sample-blockServlet.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/trunk/blocks/cocoon-captcha/cocoon-captcha-sample/src/main/resources/META-INF/cocoon/spring/cocoon-captcha-sample-blockServlet.xml
------------------------------------------------------------------------------
    svn:keywords = Id

Added: cocoon/trunk/blocks/cocoon-captcha/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-captcha/pom.xml?view=auto&rev=522844
==============================================================================
--- cocoon/trunk/blocks/cocoon-captcha/pom.xml (added)
+++ cocoon/trunk/blocks/cocoon-captcha/pom.xml Tue Mar 27 02:38:05 2007
@@ -0,0 +1,40 @@
+<?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.
+-->
+<!--+
+    | @version $Id$
+    |
+    +-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <parent>
+    <groupId>org.apache.cocoon</groupId>
+    <artifactId>cocoon-blocks-modules</artifactId>
+    <version>4-SNAPSHOT</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.cocoon</groupId>
+  <artifactId>cocoon-captcha</artifactId>
+  <packaging>pom</packaging>
+  <name>Cocoon Captcha [modules]</name>
+  <version>1-SNAPSHOT</version>
+  <modules>
+    <module>cocoon-captcha-impl</module>
+    <module>cocoon-captcha-sample</module>
+  </modules>
+</project>

Propchange: cocoon/trunk/blocks/cocoon-captcha/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/trunk/blocks/cocoon-captcha/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Id