Author: bruno Date: Mon Nov 22 07:06:14 2004 New Revision: 106188 Added: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/source/impl/XModuleSource.java - copied unchanged from r106170, cocoon/branches/BRANCH_2_1_X/src/blocks/scratchpad/java/org/apache/cocoon/components/source/impl/XModuleSource.java cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/source/impl/XModuleSourceFactory.java - copied unchanged from r106170, cocoon/branches/BRANCH_2_1_X/src/blocks/scratchpad/java/org/apache/cocoon/components/source/impl/XModuleSourceFactory.java Removed: cocoon/branches/BRANCH_2_1_X/src/blocks/scratchpad/conf/xmodule-source.xconf cocoon/branches/BRANCH_2_1_X/src/blocks/scratchpad/java/org/apache/cocoon/components/source/impl/XModuleSource.java cocoon/branches/BRANCH_2_1_X/src/blocks/scratchpad/java/org/apache/cocoon/components/source/impl/XModuleSourceFactory.java Modified: cocoon/branches/BRANCH_2_1_X/src/webapp/WEB-INF/cocoon.xconf Log: Move XModule source out of scratchpad (as is the case in the trunk).
Deleted: /cocoon/branches/BRANCH_2_1_X/src/blocks/scratchpad/conf/xmodule-source.xconf Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/scratchpad/conf/xmodule-source.xconf?view=auto&rev=106187 ============================================================================== Deleted: /cocoon/branches/BRANCH_2_1_X/src/blocks/scratchpad/java/org/apache/cocoon/components/source/impl/XModuleSource.java Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/scratchpad/java/org/apache/cocoon/components/source/impl/XModuleSource.java?view=auto&rev=106187 ============================================================================== Deleted: /cocoon/branches/BRANCH_2_1_X/src/blocks/scratchpad/java/org/apache/cocoon/components/source/impl/XModuleSourceFactory.java Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/scratchpad/java/org/apache/cocoon/components/source/impl/XModuleSourceFactory.java?view=auto&rev=106187 ============================================================================== Copied: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/source/impl/XModuleSource.java (from r106170, cocoon/branches/BRANCH_2_1_X/src/blocks/scratchpad/java/org/apache/cocoon/components/source/impl/XModuleSource.java) Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/source/impl/XModuleSource.java?view=diff&rev=106188&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/scratchpad/java/org/apache/cocoon/components/source/impl/XModuleSource.java&r1=106170&p2=cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/source/impl/XModuleSource.java&r2=106188 ============================================================================== Copied: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/source/impl/XModuleSourceFactory.java (from r106170, cocoon/branches/BRANCH_2_1_X/src/blocks/scratchpad/java/org/apache/cocoon/components/source/impl/XModuleSourceFactory.java) Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/source/impl/XModuleSourceFactory.java?view=diff&rev=106188&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/scratchpad/java/org/apache/cocoon/components/source/impl/XModuleSourceFactory.java&r1=106170&p2=cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/source/impl/XModuleSourceFactory.java&r2=106188 ============================================================================== Modified: cocoon/branches/BRANCH_2_1_X/src/webapp/WEB-INF/cocoon.xconf Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/webapp/WEB-INF/cocoon.xconf?view=diff&rev=106188&p1=cocoon/branches/BRANCH_2_1_X/src/webapp/WEB-INF/cocoon.xconf&r1=106187&p2=cocoon/branches/BRANCH_2_1_X/src/webapp/WEB-INF/cocoon.xconf&r2=106188 ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/webapp/WEB-INF/cocoon.xconf (original) +++ cocoon/branches/BRANCH_2_1_X/src/webapp/WEB-INF/cocoon.xconf Mon Nov 22 07:06:14 2004 @@ -253,6 +253,7 @@ <component-instance class="org.apache.excalibur.source.impl.FileSourceFactory" name="file"/> <component-instance class="org.apache.cocoon.components.source.impl.PartSourceFactory" name="upload"/> <component-instance class="org.apache.cocoon.components.source.impl.ModuleSourceFactory" name="module"/> + <component-instance class="org.apache.cocoon.components.source.impl.XModuleSourceFactory" name="xmodule"/> <!--+ | The "*" protocol handles all uri schemes that are not explicitely