unico 2003/12/03 05:50:50
Modified: src/blocks/slide/conf slide-repository.xroles
slide-generator.xmap slide-source.xconf
slide-action.xmap slide-repository.xconf
slide-category.xlog
Log:
fix unless path on .xroles, rename shorthand, and some formatting
Revision Changes Path
1.3 +2 -2 cocoon-2.1/src/blocks/slide/conf/slide-repository.xroles
Index: slide-repository.xroles
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/slide/conf/slide-repository.xroles,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- slide-repository.xroles 2 Dec 2003 19:18:46 -0000 1.2
+++ slide-repository.xroles 3 Dec 2003 13:50:50 -0000 1.3
@@ -1,8 +1,8 @@
<?xml version="1.0"?>
-<xroles xpath="/role-list" unless="[EMAIL
PROTECTED]'org.apache.cocoon.components.repository.Repository']">
+<xroles xpath="/role-list" unless="[EMAIL PROTECTED]'slide-repository']">
<role name="org.apache.cocoon.components.slide.SlideRepository"
- shorthand="repository"
+ shorthand="slide-repository"
default-class="org.apache.cocoon.components.slide.impl.SlideRepositoryImpl"
/>
1.4 +6 -5 cocoon-2.1/src/blocks/slide/conf/slide-generator.xmap
Index: slide-generator.xmap
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/slide/conf/slide-generator.xmap,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- slide-generator.xmap 27 Oct 2003 11:58:15 -0000 1.3
+++ slide-generator.xmap 3 Dec 2003 13:50:50 -0000 1.4
@@ -1,9 +1,10 @@
<?xml version="1.0"?>
<xmap xpath="/sitemap/components/generators" unless="[EMAIL
PROTECTED]'principallist']">
-
- <map:generator label="content"
- logger="sitemap.generator.principallist"
- name="principallist"
-
src="org.apache.cocoon.generation.PrincipalListGenerator"/>
+ <map:generator
+ label="content"
+ logger="sitemap.generator.principallist"
+ name="principallist"
+ src="org.apache.cocoon.generation.PrincipalListGenerator"
+ />
</xmap>
1.3 +5 -3 cocoon-2.1/src/blocks/slide/conf/slide-source.xconf
Index: slide-source.xconf
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/slide/conf/slide-source.xconf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- slide-source.xconf 28 Apr 2003 07:17:22 -0000 1.2
+++ slide-source.xconf 3 Dec 2003 13:50:50 -0000 1.3
@@ -1,7 +1,9 @@
<?xml version="1.0"?>
<xconf xpath="/cocoon/source-factories" unless="[EMAIL PROTECTED]'slide']">
-
<!-- pseudo protocol for Jakarta Slide repositories -->
- <component-instance name="slide" logger="slide.sourcefactory"
-
class="org.apache.cocoon.components.source.impl.SlideSourceFactory"/>
+ <component-instance
+ name="slide"
+ logger="slide.sourcefactory"
+ class="org.apache.cocoon.components.source.impl.SlideSourceFactory"
+ />
</xconf>
1.2 +10 -4 cocoon-2.1/src/blocks/slide/conf/slide-action.xmap
Index: slide-action.xmap
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/slide/conf/slide-action.xmap,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- slide-action.xmap 9 Mar 2003 00:06:14 -0000 1.1
+++ slide-action.xmap 3 Dec 2003 13:50:50 -0000 1.2
@@ -1,7 +1,13 @@
<?xml version="1.0"?>
<xmap xpath="/sitemap/components/actions" unless="[EMAIL
PROTECTED]'source']">
-
- <map:action logger="sitemap.action.source" name="source"
src="org.apache.cocoon.acting.SourceMultiAction"/>
-
- <map:action logger="sitemap.action.principal" name="principal"
src="org.apache.cocoon.acting.PrincipalMultiAction"/>
+ <map:action
+ name="source"
+ logger="sitemap.action.source"
+ src="org.apache.cocoon.acting.SourceMultiAction"
+ />
+ <map:action
+ name="principal"
+ logger="sitemap.action.principal"
+ src="org.apache.cocoon.acting.PrincipalMultiAction"
+ />
</xmap>
1.6 +6 -4 cocoon-2.1/src/blocks/slide/conf/slide-repository.xconf
Index: slide-repository.xconf
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/slide/conf/slide-repository.xconf,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- slide-repository.xconf 2 Dec 2003 19:18:46 -0000 1.5
+++ slide-repository.xconf 3 Dec 2003 13:50:50 -0000 1.6
@@ -1,13 +1,15 @@
<?xml version="1.0"?>
-<xconf xpath="/cocoon" unless="repository">
+<xconf xpath="/cocoon" unless="slide-repository">
<!--+
| Jakarta Slide repository
|
| The Slide repository handles serveral sources sorted in namspaces.
+-->
- <repository logger="slide.repository"
- file="context://samples/slide/slide.xconf"/>
+ <slide-repository
+ logger="slide.repository"
+ file="context://samples/slide/slide.xconf"
+ />
<!--+
| Principal providers:
@@ -18,7 +20,7 @@
class="org.apache.avalon.excalibur.component.ExcaliburComponentSelector"
logger="core.principalprovider"
default="slide">
-
+
<!-- Default implementation via Jakarta Slide -->
<slide
name="slide"
1.2 +1 -1 cocoon-2.1/src/blocks/slide/conf/slide-category.xlog
Index: slide-category.xlog
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/slide/conf/slide-category.xlog,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- slide-category.xlog 28 Apr 2003 07:22:00 -0000 1.1
+++ slide-category.xlog 3 Dec 2003 13:50:50 -0000 1.2
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<xlog xpath="/logkit/categories" unless="[EMAIL PROTECTED]'slide']">
- <category name="slide" log-level="ERROR">
+ <category name="slide" log-level="INFO">
<log-target id-ref="slide"/>
<log-target id-ref="error"/>
</category>
