Mailing-List: contact cvs-help@cocoon.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@cocoon.apache.org
Received-SPF: pass (asf.osuosl.org: local policy)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r410122 - in /cocoon/trunk/blocks:
 cocoon-authentication-fw/cocoon-authentication-fw-sample/src/main/resources/COB-INF/
 cocoon-authentication-fw/cocoon-authentication-fw-sample/src/main/resources/COB-INF/conf/
 cocoon-portal/cocoon-portal-sa...
Date: Mon, 29 May 2006 17:26:05 -0000
To: cvs@cocoon.apache.org
From: cziegeler@apache.org
Message-Id: <20060529172607.4BAD61A983A@eris.apache.org>

Author: cziegeler
Date: Mon May 29 10:26:05 2006
New Revision: 410122

URL: http://svn.apache.org/viewvc?rev=410122&view=rev
Log:
Use new property and configuration mechanism

Added:
    cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-sample/src/main/resources/COB-INF/conf/
    cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-sample/src/main/resources/COB-INF/conf/auth-manager-flow.xconf   (with props)
    cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-sample/src/main/resources/COB-INF/conf/auth-manager.xconf   (with props)
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/conf/auth-authfw.xconf   (with props)
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/conf/properties/
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/conf/properties/variables.properties   (with props)
Modified:
    cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-sample/src/main/resources/COB-INF/flow.xmap
    cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-sample/src/main/resources/COB-INF/sitemap.xmap
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/conf/cocoon-portal-sample.xconf
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/sitemap-auth.xmap
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/sitemap.xmap

Added: cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-sample/src/main/resources/COB-INF/conf/auth-manager-flow.xconf
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-sample/src/main/resources/COB-INF/conf/auth-manager-flow.xconf?rev=410122&view=auto
==============================================================================
--- cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-sample/src/main/resources/COB-INF/conf/auth-manager-flow.xconf (added)
+++ cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-sample/src/main/resources/COB-INF/conf/auth-manager-flow.xconf Mon May 29 10:26:05 2006
@@ -0,0 +1,31 @@
+<?xml version="1.0"?>
+<!--
+  Copyright 1999-2006 The Apache Software Foundation
+
+  Licensed 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.
+-->
+<!--+
+    | This is the configuration for the authentication-fw.
+    |
+    | @version $Id$
+    +-->
+<components>
+  <authentication-manager>
+    <handlers>
+      <handler name="flowdemohandler">
+        <redirect-to uri="cocoon:/login"/>
+        <authentication uri="cocoon:raw:/authenticate"/>
+      </handler>
+    </handlers>
+  </authentication-manager>
+</components>
\ No newline at end of file

Propchange: cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-sample/src/main/resources/COB-INF/conf/auth-manager-flow.xconf
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-sample/src/main/resources/COB-INF/conf/auth-manager-flow.xconf
------------------------------------------------------------------------------
    svn:keywords = Id

Added: cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-sample/src/main/resources/COB-INF/conf/auth-manager.xconf
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-sample/src/main/resources/COB-INF/conf/auth-manager.xconf?rev=410122&view=auto
==============================================================================
--- cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-sample/src/main/resources/COB-INF/conf/auth-manager.xconf (added)
+++ cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-sample/src/main/resources/COB-INF/conf/auth-manager.xconf Mon May 29 10:26:05 2006
@@ -0,0 +1,49 @@
+<?xml version="1.0"?>
+<!--
+  Copyright 1999-2006 The Apache Software Foundation
+
+  Licensed 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.
+-->
+<!--+
+    | This is the configuration for the authentication-fw.
+    |
+    | @version $Id$
+    +-->
+<components>
+  <authentication-manager>
+    <handlers>
+      <!-- A handler is responsible for protecting documents (pipelines).
+           The handler requires three configuration values. One of them is
+           a unique name that is used as a reference for the handler.
+           The other values are documented inline below. 
+      -->
+      <handler name="demohandler">
+      	<!-- The redirect-to configuration defines a pipeline that is called
+      		 whenever a not authenticated user tries to access a protected
+      		 document (pipeline) -->
+        <redirect-to uri="cocoon:/login"/>
+        <!-- The authentication configuration defines the authentication process.
+        	 In this example, an internal pipeline "authenticate" is called.
+           	 This pipeline gets all necessary information like user name and
+           	 password as parameters and tries to authenticate this user.
+           	 On successful authentication the pipeline delivers a specific
+           	 XML format.
+        --> 	 
+        <authentication uri="cocoon:raw:/authenticate"/>
+        <!-- In addition you can specifiy a logout-uri parameter above. Then
+          	 the pipeline denoted by that parameter is called on logout.
+        -->
+      </handler>
+    </handlers>
+  </authentication-manager>
+</components>
\ No newline at end of file

Propchange: cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-sample/src/main/resources/COB-INF/conf/auth-manager.xconf
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-sample/src/main/resources/COB-INF/conf/auth-manager.xconf
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-sample/src/main/resources/COB-INF/flow.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-sample/src/main/resources/COB-INF/flow.xmap?rev=410122&r1=410121&r2=410122&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-sample/src/main/resources/COB-INF/flow.xmap (original)
+++ cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-sample/src/main/resources/COB-INF/flow.xmap Mon May 29 10:26:05 2006
@@ -18,28 +18,22 @@
 <!--+
     | Authentication (with flow) block samples sitemap.
     |
-    | CVS $Id$
+    | @version $Id$
     +-->
 
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
 
+  <!-- Include the configuration for the authentication manager. -->
+  <map:components>
+    <map:include src="conf/auth-manager-flow.xconf"/>
+  </map:components>
+
   <map:flow language="javascript">
      <map:script src="flow/sample.js"/>
   </map:flow>
 
 <!-- =========================== Pipelines ================================= -->
   <map:pipelines>
-    <map:component-configurations>
-      <authentication-manager>
-        <handlers>
-          <handler name="flowdemohandler">
-            <redirect-to uri="cocoon:/login"/>
-            <authentication uri="cocoon:raw:/authenticate"/>
-          </handler>
-        </handlers>
-      </authentication-manager>
-    </map:component-configurations>
-
     <map:pipeline>
       <map:match pattern="">
         <map:redirect-to uri="login" session="true"/>

Modified: cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-sample/src/main/resources/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-sample/src/main/resources/COB-INF/sitemap.xmap?rev=410122&r1=410121&r2=410122&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-sample/src/main/resources/COB-INF/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-sample/src/main/resources/COB-INF/sitemap.xmap Mon May 29 10:26:05 2006
@@ -18,42 +18,17 @@
 <!--+
     | Authentication block samples sitemap.
     |
-    | CVS $Id$
+    | @version $Id$
     +-->
 
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
+  <!-- Include the configuration for the authentication manager. -->
+  <map:components>
+    <map:include src="conf/auth-manager.xconf"/>
+  </map:components>
 
-<!-- =========================== Pipelines ================================= -->
+  <!-- =========================== Pipelines ================================= -->
   <map:pipelines>
-    <map:component-configurations>
-      <authentication-manager>
-        <handlers>
-          <!-- A handler is responsible for protecting documents (pipelines).
-          	   The handler requires three configuration values. One of them is
-          	   a unique name that is used as a reference for the handler.
-          	   The other values are documented inline below. 
-           -->
-          <handler name="demohandler">
-          	<!-- The redirect-to configuration defines a pipeline that is called
-          		 whenever a not authenticated user tries to access a protected
-          		 document (pipeline) -->
-            <redirect-to uri="cocoon:/login"/>
-            <!-- The authentication configuration defines the authentication process.
-            	 In this example, an internal pipeline "authenticate" is called.
-            	 This pipeline gets all necessary information like user name and
-            	 password as parameters and tries to authenticate this user.
-            	 On successful authentication the pipeline delivers a specific
-            	 XML format.
-            --> 	 
-            <authentication uri="cocoon:raw:/authenticate"/>
-            <!-- In addition you can specifiy a logout-uri parameter above. Then
-            	 the pipeline denoted by that parameter is called on logout.
-            -->
-          </handler>
-        </handlers>
-      </authentication-manager>
-    </map:component-configurations>
-
     <map:pipeline>
       <map:match pattern="flow/**">
         <map:mount src="flow.xmap" uri-prefix="flow"/>

Added: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/conf/auth-authfw.xconf
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/conf/auth-authfw.xconf?rev=410122&view=auto
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/conf/auth-authfw.xconf (added)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/conf/auth-authfw.xconf Mon May 29 10:26:05 2006
@@ -0,0 +1,31 @@
+<?xml version="1.0"?>
+<!--
+  Copyright 1999-2006 The Apache Software Foundation
+
+  Licensed 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.
+-->
+<!--+
+    | This is the configuration for using the authentication-fw for authentication.
+    |
+    | @version $Id$
+    +-->
+<components>
+  <authentication-manager>
+    <handlers>
+      <handler name="portal-handler">
+        <redirect-to uri="cocoon:/login"/>
+        <authentication uri="cocoon:raw:/sunrise-authuser"/>
+      </handler>
+    </handlers>
+  </authentication-manager>
+</components>
\ No newline at end of file

Propchange: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/conf/auth-authfw.xconf
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/conf/auth-authfw.xconf
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/conf/cocoon-portal-sample.xconf
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/conf/cocoon-portal-sample.xconf?rev=410122&r1=410121&r2=410122&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/conf/cocoon-portal-sample.xconf (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/conf/cocoon-portal-sample.xconf Mon May 29 10:26:05 2006
@@ -41,6 +41,10 @@
   <!-- We use CoWarp for authentication. If you don't use CoWarp remove this line: -->
   <include src="auth-cowarp.xconf"/>
   
+  <!-- If you want to use the authentication-fw uncomment this line: 
+  <include src="auth-authfw.xconf"/>
+  -->
+
   <!-- We use Castor for persisting/mapping the profiles to XML: -->
   <include src="resource://org/apache/cocoon/portal/persistence/castor/portal-castor.roles"/>
 

Added: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/conf/properties/variables.properties
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/conf/properties/variables.properties?rev=410122&view=auto
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/conf/properties/variables.properties (added)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/conf/properties/variables.properties Mon May 29 10:26:05 2006
@@ -0,0 +1,21 @@
+#  Copyright 2006 The Apache Software Foundation
+#
+#  Licensed 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.
+#
+
+# select the skin to use
+skin=modern
+# the title of the portal page
+mainTitle=Cocoon Portal
+# the title of the tools page
+toolsTitle=Cocoon Portal Tools

Propchange: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/conf/properties/variables.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/conf/properties/variables.properties
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/sitemap-auth.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/sitemap-auth.xmap?rev=410122&r1=410121&r2=410122&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/sitemap-auth.xmap (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/sitemap-auth.xmap Mon May 29 10:26:05 2006
@@ -19,7 +19,7 @@
 
   <!-- ========================= Components ================================ -->
 
-  <map:components logger="portal">
+  <map:components logger="portal" property-dir="conf/properties">
     <map:generators default="file">
       <map:generator name="portal" src="org.apache.cocoon.portal.generation.PortalGenerator"/>
     </map:generators>
@@ -83,27 +83,7 @@
   <!-- =========================== Pipelines ================================= -->
 
   <map:pipelines>
-
-    <map:component-configurations>
-      <authentication-manager>
-        <handlers>
-          <handler name="portal-handler">
-            <redirect-to uri="cocoon:/login"/>
-            <authentication uri="cocoon:raw:/sunrise-authuser"/>
-          </handler>
-        </handlers>
-      </authentication-manager>
-
-      <!-- select skin to use -->
-      <map:global-variables>
-				<skin>common</skin>
-				<mainTitle>Cocoon Portal</mainTitle>
-				<toolsTitle>Cocoon Portal Tools</toolsTitle>
-      </map:global-variables>
-
-    </map:component-configurations>
-
-  <map:pipeline>
+    <map:pipeline>
     <!-- This action sets the portal name for the current request and
          initializes the portal service. So this should be the first
          task for every request!

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/sitemap.xmap?rev=410122&r1=410121&r2=410122&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/sitemap.xmap Mon May 29 10:26:05 2006
@@ -19,7 +19,7 @@
 
   <!-- ========================= Components ================================ -->
 
-  <map:components logger="portal">
+  <map:components logger="portal" property-dir="conf/properties">
     <map:include src="conf/cocoon-portal-sample.xconf"/>
     <map:include src="conf/cocoon-portal-tools.xconf"/>
 
@@ -81,16 +81,6 @@
   <!-- =========================== Pipelines ================================= -->
 
   <map:pipelines>
-    <map:component-configurations>
-      <!-- select skin to use -->
-      <map:global-variables>
-		<skin>modern</skin>
-    	<mainTitle>Cocoon Portal</mainTitle>
-	    <toolsTitle>Cocoon Portal Tools</toolsTitle>
-      </map:global-variables>
-
-    </map:component-configurations>
-
     <!-- The internal pipelines for loading and saving -->
     <map:pipeline internal-only="true">
       <map:match pattern="sunrise-authuser">