cziegeler 2003/02/28 00:00:34
Modified: src/java/org/apache/cocoon cocoon.roles
. build.xml build.properties
src/webapp/WEB-INF cocoon.xconf
Added: src/deprecated/conf deprecated.xroles deprecated.xconf
Log:
Moving deprecated configuration into deprecated "block"
Revision Changes Path
1.49 +0 -47 xml-cocoon2/src/java/org/apache/cocoon/cocoon.roles
Index: cocoon.roles
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/cocoon.roles,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- cocoon.roles 22 Feb 2003 13:54:01 -0000 1.48
+++ cocoon.roles 28 Feb 2003 08:00:32 -0000 1.49
@@ -225,51 +225,4 @@
shorthand="global-variables"
default-class="org.apache.cocoon.components.modules.input.SitemapVariableHolder"/>
- <!-- ====================== deprecated ======================== -->
-
- <!-- DEPRECATED, use the avalon excalibur entity-resolver instead -->
- <role name="org.apache.cocoon.components.resolver.Resolver"
- shorthand="resolver"
- default-class="org.apache.cocoon.components.resolver.ResolverImpl"/>
-
- <!-- DEPRECATED, use the avalon excalibur xml-parser instead -->
- <role name="org.apache.cocoon.components.parser.Parser"
- shorthand="parser"
- default-class="org.apache.cocoon.components.parser.JaxpParser"/>
-
- <!-- DEPRECATED, use the avalon excalibur source resolve instead -->
- <role name="org.apache.cocoon.components.url.URLFactory"
- shorthand="url-factory"
- default-class="org.apache.cocoon.components.url.URLFactoryImpl"/>
-
- <!-- DEPRECATED, use the avalon excalibur source resolve instead -->
- <role name="org.apache.cocoon.components.source.SourceHandler"
- shorthand="source-handler"
- default-class="org.apache.cocoon.components.source.SourceHandlerImpl"/>
-
- <!-- DEPRECATED, use the avalon excalibur xslt processor instead -->
- <role name="org.apache.cocoon.components.xslt.XSLTProcessor"
- shorthand="old-xslt-processor"
- default-class="org.apache.cocoon.components.xslt.XSLTProcessorImpl"/>
-
- <!-- DEPRECATED, use the avalon excalibur store implementation instead -->
- <role name="org.apache.cocoon.components.store.Store/Repository"
- shorthand="repository"
- default-class="org.apache.cocoon.components.store.FilesystemStore"/>
-
- <!-- DEPRECATED, use the avalon excalibur store implementation instead -->
- <role name="org.apache.cocoon.components.store.Store/TransientCache"
- shorthand="cache-transient"
- default-class="org.apache.cocoon.components.store.MRUMemoryStore"/>
-
- <!-- DEPRECATED, use the avalon excalibur store implementation instead -->
- <role name="org.apache.cocoon.components.store.Store/PersistentCache"
- shorthand="cache-persistent"
- default-class="org.apache.cocoon.components.store.FilesystemStore"/>
-
- <!-- DEPRECATED, use the avalon excalibur store implementation instead -->
- <role name="org.apache.cocoon.components.store.StoreJanitor"
- shorthand="old-store-janitor"
- default-class="org.apache.cocoon.components.store.StoreJanitorImpl"/>
-
</role-list>
1.1 xml-cocoon2/src/deprecated/conf/deprecated.xroles
Index: deprecated.xroles
===================================================================
<?xml version="1.0"?>
<xroles xpath="/role-list" unless="[EMAIL
PROTECTED]'org.apache.cocoon.components.resolver.Resolver']">
<!-- ====================== deprecated ======================== -->
<!-- DEPRECATED, use the avalon excalibur entity-resolver instead -->
<role name="org.apache.cocoon.components.resolver.Resolver"
shorthand="resolver"
default-class="org.apache.cocoon.components.resolver.ResolverImpl"/>
<!-- DEPRECATED, use the avalon excalibur xml-parser instead -->
<role name="org.apache.cocoon.components.parser.Parser"
shorthand="parser"
default-class="org.apache.cocoon.components.parser.JaxpParser"/>
<!-- DEPRECATED, use the avalon excalibur source resolve instead -->
<role name="org.apache.cocoon.components.url.URLFactory"
shorthand="url-factory"
default-class="org.apache.cocoon.components.url.URLFactoryImpl"/>
<!-- DEPRECATED, use the avalon excalibur source resolve instead -->
<role name="org.apache.cocoon.components.source.SourceHandler"
shorthand="source-handler"
default-class="org.apache.cocoon.components.source.SourceHandlerImpl"/>
<!-- DEPRECATED, use the avalon excalibur xslt processor instead -->
<role name="org.apache.cocoon.components.xslt.XSLTProcessor"
shorthand="old-xslt-processor"
default-class="org.apache.cocoon.components.xslt.XSLTProcessorImpl"/>
<!-- DEPRECATED, use the avalon excalibur store implementation instead -->
<role name="org.apache.cocoon.components.store.Store/Repository"
shorthand="repository"
default-class="org.apache.cocoon.components.store.FilesystemStore"/>
<!-- DEPRECATED, use the avalon excalibur store implementation instead -->
<role name="org.apache.cocoon.components.store.Store/TransientCache"
shorthand="cache-transient"
default-class="org.apache.cocoon.components.store.MRUMemoryStore"/>
<!-- DEPRECATED, use the avalon excalibur store implementation instead -->
<role name="org.apache.cocoon.components.store.Store/PersistentCache"
shorthand="cache-persistent"
default-class="org.apache.cocoon.components.store.FilesystemStore"/>
<!-- DEPRECATED, use the avalon excalibur store implementation instead -->
<role name="org.apache.cocoon.components.store.StoreJanitor"
shorthand="old-store-janitor"
default-class="org.apache.cocoon.components.store.StoreJanitorImpl"/>
</xroles>
1.1 xml-cocoon2/src/deprecated/conf/deprecated.xconf
Index: deprecated.xconf
===================================================================
<?xml version="1.0"?>
<xconf xpath="/cocoon" unless="url-factory">
<!--+
| URL Factory
|
| The url factory adds special url protocols to the system, they are then
| available inside Cocoon, e.g. as a source argument for one of the sitemap
| components.
|
| THIS COMPONENT IS DEPRECATED AND SHOULD NOT BE USED ANYMORE
+-->
<url-factory logger="core.url-factory">
<!-- Allows access to resources available from the ClassLoader, using
getResource() method. -->
<protocol class="org.apache.cocoon.components.url.ResourceURLFactory"
name="resource"/>
</url-factory>
<!--+
| Source Handler
|
| The source handler adds special url protocols to the system, they are
| then available inside Cocoon, e.g. as a source argument for one of the
| sitemap components.
|
| THIS COMPONENT IS DEPRECATED AND SHOULD NOT BE USED ANYMORE
+-->
<source-handler logger="core.source-handler">
<!-- file protocol : this is a WriteableSource -->
<protocol class="org.apache.cocoon.components.source.FileSourceFactory"
name="file"/>
<!-- Allows access to resources available from the servlet context, using
getResource() method. -->
<protocol class="org.apache.cocoon.components.source.ContextSourceFactory"
name="context"/>
</source-handler>
</xconf>
1.342 +13 -1 xml-cocoon2/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/build.xml,v
retrieving revision 1.341
retrieving revision 1.342
diff -u -r1.341 -r1.342
--- build.xml 28 Feb 2003 01:09:49 -0000 1.341
+++ build.xml 28 Feb 2003 08:00:33 -0000 1.342
@@ -242,6 +242,18 @@
<target name="compile-deprecated" depends="prepare" unless="exclude.deprecated">
<mkdir dir="${build.deprecated}"/>
+ <!-- FIXME: Is this the correct place? -->
+ <xpatch configuration="${build.dest}/org/apache/cocoon/cocoon.roles"
+ directory="${deprecated.conf}"
+ extension="xroles"/>
+ <copy todir="${build.src}">
+ <fileset dir="${deprecated.conf}">
+ <include name="*.xmap"/>
+ <include name="*.xpipe"/>
+ <include name="*.xconf"/>
+ </fileset>
+ </copy>
+
<javac srcdir="${deprecated.src}"
destdir="${build.deprecated}"
debug="${compiler.debug}"
1.11 +1 -0 xml-cocoon2/build.properties
Index: build.properties
===================================================================
RCS file: /home/cvs/xml-cocoon2/build.properties,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- build.properties 27 Feb 2003 22:42:28 -0000 1.10
+++ build.properties 28 Feb 2003 08:00:33 -0000 1.11
@@ -109,6 +109,7 @@
# Deprecated Stuff
deprecated=${src}/deprecated
deprecated.src=${deprecated}/java
+deprecated.conf=${deprecated}/conf
# Tools
tools=tools
1.64 +0 -30 xml-cocoon2/src/webapp/WEB-INF/cocoon.xconf
Index: cocoon.xconf
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/webapp/WEB-INF/cocoon.xconf,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- cocoon.xconf 22 Feb 2003 14:27:31 -0000 1.63
+++ cocoon.xconf 28 Feb 2003 08:00:34 -0000 1.64
@@ -366,36 +366,6 @@
<component-instance class="org.apache.excalibur.source.impl.URLSourceFactory"
name="*"/>
</source-factories>
- <!--+
- | URL Factory
- |
- | The url factory adds special url protocols to the system, they are then
- | available inside Cocoon, e.g. as a source argument for one of the sitemap
- | components.
- |
- | THIS COMPONENT IS DEPRECATED AND SHOULD NOT BE USED ANYMORE
- +-->
- <url-factory logger="core.url-factory">
- <!-- Allows access to resources available from the ClassLoader, using
getResource() method. -->
- <protocol class="org.apache.cocoon.components.url.ResourceURLFactory"
name="resource"/>
- </url-factory>
-
- <!--+
- | Source Handler
- |
- | The source handler adds special url protocols to the system, they are
- | then available inside Cocoon, e.g. as a source argument for one of the
- | sitemap components.
- |
- | THIS COMPONENT IS DEPRECATED AND SHOULD NOT BE USED ANYMORE
- +-->
- <source-handler logger="core.source-handler">
- <!-- file protocol : this is a WriteableSource -->
- <protocol class="org.apache.cocoon.components.source.FileSourceFactory"
name="file"/>
- <!-- Allows access to resources available from the servlet context, using
getResource() method. -->
- <protocol class="org.apache.cocoon.components.source.ContextSourceFactory"
name="context"/>
- </source-handler>
-
<!-- ================ Internationalization Catalogs =================== -->
<!--+
