cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r501808 - in /cocoon/trunk: blocks/cocoon-auth/cocoon-auth-sample/src/main/resources/COB-INF/ blocks/cocoon-auth/cocoon-auth-sample/src/main/resources/COB-INF/docs/ blocks/cocoon-auth/cocoon-auth-sample/src/main/resources/META-INF/cocoon/sp...
Date Wed, 31 Jan 2007 11:34:49 GMT
Author: cziegeler
Date: Wed Jan 31 03:34:48 2007
New Revision: 501808

URL: http://svn.apache.org/viewvc?view=rev&rev=501808
Log:
Apply patch from Felix Knecht for making the auth samples work and available through the allBlocks
profile.
This fixes issue # COCOON-1988

Added:
    cocoon/trunk/blocks/cocoon-auth/cocoon-auth-sample/src/main/resources/COB-INF/auth.xsamples
Modified:
    cocoon/trunk/blocks/cocoon-auth/cocoon-auth-sample/src/main/resources/COB-INF/docs/login.xml
    cocoon/trunk/blocks/cocoon-auth/cocoon-auth-sample/src/main/resources/COB-INF/sitemap.xmap
    cocoon/trunk/blocks/cocoon-auth/cocoon-auth-sample/src/main/resources/META-INF/cocoon/spring/auth-cauth.xml
    cocoon/trunk/core/cocoon-webapp/pom.xml

Added: cocoon/trunk/blocks/cocoon-auth/cocoon-auth-sample/src/main/resources/COB-INF/auth.xsamples
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-auth/cocoon-auth-sample/src/main/resources/COB-INF/auth.xsamples?view=auto&rev=501808
==============================================================================
--- cocoon/trunk/blocks/cocoon-auth/cocoon-auth-sample/src/main/resources/COB-INF/auth.xsamples
(added)
+++ cocoon/trunk/blocks/cocoon-auth/cocoon-auth-sample/src/main/resources/COB-INF/auth.xsamples
Wed Jan 31 03:34:48 2007
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<!--
+  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.
+-->
+<xsamples xpath="/samples" unless="group[@name='Auth Block']">
+  <group name="Auth Block">
+    <sample name="Auth Block" href="cocoon-auth-sample/">
+      This is a demo of the authentication framework integrated into Cocoon. 
+    </sample>
+  </group>
+</xsamples>

Modified: cocoon/trunk/blocks/cocoon-auth/cocoon-auth-sample/src/main/resources/COB-INF/docs/login.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-auth/cocoon-auth-sample/src/main/resources/COB-INF/docs/login.xml?view=diff&rev=501808&r1=501807&r2=501808
==============================================================================
--- cocoon/trunk/blocks/cocoon-auth/cocoon-auth-sample/src/main/resources/COB-INF/docs/login.xml
(original)
+++ cocoon/trunk/blocks/cocoon-auth/cocoon-auth-sample/src/main/resources/COB-INF/docs/login.xml
Wed Jan 31 03:34:48 2007
@@ -23,9 +23,10 @@
    <para>
      This page serves as an example of the authentication framework.
    </para>
-   <para>Please log in using your name (cocoon will work)</para>
+   <para>Please log in using your name (cocoon:cocoon will work)</para>
    <form target="do-login" method="post">
-     <input type="text" name="username"/>
+     <input type="text" name="username" title="Username: " />
+     <input type="password" name="password" title="Password: " />
      <input type="submit">Login</input>
    </form>
  </content>

Modified: cocoon/trunk/blocks/cocoon-auth/cocoon-auth-sample/src/main/resources/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-auth/cocoon-auth-sample/src/main/resources/COB-INF/sitemap.xmap?view=diff&rev=501808&r1=501807&r2=501808
==============================================================================
--- cocoon/trunk/blocks/cocoon-auth/cocoon-auth-sample/src/main/resources/COB-INF/sitemap.xmap
(original)
+++ cocoon/trunk/blocks/cocoon-auth/cocoon-auth-sample/src/main/resources/COB-INF/sitemap.xmap
Wed Jan 31 03:34:48 2007
@@ -54,6 +54,7 @@
         <map:act type="cauth-login">
           <map:parameter name="application" value="sample"/>
           <map:parameter name="name" value="{request-param:username}"/>
+          <map:parameter name="password" value="{request-param:password}"/>
           <map:redirect-to uri="protected"/>
         </map:act>
         <!-- something was wrong, try it again -->

Modified: cocoon/trunk/blocks/cocoon-auth/cocoon-auth-sample/src/main/resources/META-INF/cocoon/spring/auth-cauth.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-auth/cocoon-auth-sample/src/main/resources/META-INF/cocoon/spring/auth-cauth.xml?view=diff&rev=501808&r1=501807&r2=501808
==============================================================================
--- cocoon/trunk/blocks/cocoon-auth/cocoon-auth-sample/src/main/resources/META-INF/cocoon/spring/auth-cauth.xml
(original)
+++ cocoon/trunk/blocks/cocoon-auth/cocoon-auth-sample/src/main/resources/META-INF/cocoon/spring/auth-cauth.xml
Wed Jan 31 03:34:48 2007
@@ -30,7 +30,6 @@
   <bean name="org.apache.cocoon.auth.SecurityHandler/simple"
         class="org.apache.cocoon.auth.impl.SimpleSecurityHandler"
         scope="singleton">
-    <property name="sourceResolver" ref="org.apache.excalibur.source.SourceResolver"/>
     <property name="userProperties">
       <value>
         cocoon=cocoon

Modified: cocoon/trunk/core/cocoon-webapp/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-webapp/pom.xml?view=diff&rev=501808&r1=501807&r2=501808
==============================================================================
--- cocoon/trunk/core/cocoon-webapp/pom.xml (original)
+++ cocoon/trunk/core/cocoon-webapp/pom.xml Wed Jan 31 03:34:48 2007
@@ -112,7 +112,7 @@
       <dependencies>
         <dependency>
           <groupId>org.apache.cocoon</groupId>
-          <artifactId>cocoon-xsp-sample</artifactId>
+          <artifactId>cocoon-auth-sample</artifactId>
           <version>1.0.0-SNAPSHOT</version>
         </dependency>
         <dependency>
@@ -125,6 +125,11 @@
           <artifactId>cocoon-portal-sample</artifactId>
           <version>1.0.0-SNAPSHOT</version>
         </dependency>    
+        <dependency>
+          <groupId>org.apache.cocoon</groupId>
+          <artifactId>cocoon-xsp-sample</artifactId>
+          <version>1.0.0-SNAPSHOT</version>
+        </dependency>
       </dependencies>
     </profile>
   </profiles>



Mime
View raw message