You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by cz...@apache.org on 2006/07/20 21:47:43 UTC
svn commit: r424032 - in
/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF:
./ config/ config/xconf/
Author: cziegeler
Date: Thu Jul 20 12:47:42 2006
New Revision: 424032
URL: http://svn.apache.org/viewvc?rev=424032&view=rev
Log:
Default locations for configs
Added:
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/xconf/auth-cauth.xconf
- copied unchanged from r424030, cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/auth-cauth.xconf
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/xconf/cocoon-portal-sample.xconf
- copied, changed from r424030, cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/cocoon-portal-sample.xconf
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/xconf/cocoon-portal-tools.xconf
- copied unchanged from r424030, cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/cocoon-portal-tools.xconf
Removed:
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/auth-cauth.xconf
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/cocoon-portal-sample.xconf
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/cocoon-portal-tools.xconf
Modified:
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/sitemap.xmap
Copied: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/xconf/cocoon-portal-sample.xconf (from r424030, cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/cocoon-portal-sample.xconf)
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/xconf/cocoon-portal-sample.xconf?p2=cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/xconf/cocoon-portal-sample.xconf&p1=cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/cocoon-portal-sample.xconf&r1=424030&r2=424032&rev=424032&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/cocoon-portal-sample.xconf (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/xconf/cocoon-portal-sample.xconf Thu Jul 20 12:47:42 2006
@@ -30,6 +30,8 @@
| components properly. However, the best way is to start your
| portal project from scratch!
+-->
+ <!-- Load Sitemap components provided by CAuth. -->
+ <map:include src="resource://org/apache/cocoon/auth/sitemap-addons.xconf"/>
<!-- Include portal roles -->
<include src="resource://org/apache/cocoon/portal/portal.roles"/>
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=424032&r1=424031&r2=424032&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 Thu Jul 20 12:47:42 2006
@@ -20,12 +20,6 @@
<!-- ========================= Components ================================ -->
<map:components logger="portal" property-dir="conf/properties">
- <map:include src="conf/cocoon-portal-sample.xconf"/>
- <map:include src="conf/cocoon-portal-tools.xconf"/>
-
- <!-- Load Sitemap components provided by CAuth. -->
- <map:include src="resource://org/apache/cocoon/auth/sitemap-addons.xconf"/>
-
<map:generators default="file">
<map:generator name="portal" src="org.apache.cocoon.portal.generation.PortalGenerator"/>
</map:generators>