Return-Path: 
 <cvs-return-32320-apmail-cocoon-cvs-archive=cocoon.apache.org@cocoon.apache.org>
Delivered-To: apmail-cocoon-cvs-archive@www.apache.org
Received: (qmail 90572 invoked from network); 8 Dec 2007 04:22:08 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 8 Dec 2007 04:22:08 -0000
Received: (qmail 22209 invoked by uid 500); 8 Dec 2007 04:21:57 -0000
Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org
Received: (qmail 22139 invoked by uid 500); 8 Dec 2007 04:21:57 -0000
Mailing-List: contact cvs-help@cocoon.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@cocoon.apache.org
list-help: <mailto:cvs-help@cocoon.apache.org>
list-unsubscribe: <mailto:cvs-unsubscribe@cocoon.apache.org>
List-Post: <mailto:cvs@cocoon.apache.org>
List-Id: <cvs.cocoon.apache.org>
Delivered-To: mailing list cvs@cocoon.apache.org
Received: (qmail 22128 invoked by uid 99); 8 Dec 2007 04:21:57 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 07 Dec 2007 20:21:57 -0800
X-ASF-Spam-Status: No, hits=-100.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 08 Dec 2007 04:21:34 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 7580C1A9832; Fri,  7 Dec 2007 20:21:37 -0800 (PST)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r602317 - in /cocoon/trunk/blocks/cocoon-core-sample:
 cocoon-core-additional-sample/src/main/resources/META-INF/cocoon/avalon/
 cocoon-core-main-sample/src/main/resources/META-INF/cocoon/avalon/
Date: Sat, 08 Dec 2007 04:21:37 -0000
To: cvs@cocoon.apache.org
From: vgritsenko@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20071208042137.7580C1A9832@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: vgritsenko
Date: Fri Dec  7 20:21:36 2007
New Revision: 602317

URL: http://svn.apache.org/viewvc?rev=602317&view=rev
Log:
move modules config to main samples

Added:
    cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/META-INF/cocoon/avalon/
      - copied from r601761, cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/META-INF/cocoon/avalon/
Removed:
    cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/META-INF/cocoon/avalon/
Modified:
    cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/META-INF/cocoon/avalon/cocoon-core-additional-sample-modules-input.xconf

Modified: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/META-INF/cocoon/avalon/cocoon-core-additional-sample-modules-input.xconf
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/META-INF/cocoon/avalon/cocoon-core-additional-sample-modules-input.xconf?rev=602317&r1=601761&r2=602317&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/META-INF/cocoon/avalon/cocoon-core-additional-sample-modules-input.xconf (original)
+++ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/META-INF/cocoon/avalon/cocoon-core-additional-sample-modules-input.xconf Fri Dec  7 20:21:36 2007
@@ -15,37 +15,39 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<!-- SVN $Id$ -->
+
+<!--
+  - Define five additional input modules, 'defaults', 'myxml',
+  - 'slashdot' 'random-100-to-500' and 'random-5000-to-10000',
+  - for the input modules sample.
+  -
+  - $Id$
+  -->
 <components>
   
-  <!--+
-      | Following five modules definitions, 'defaults', 'myxml',
-      | 'slashdot' 'random-100-to-500' and 'random-5000-to-10000',
-      | are used only in the samples.
-      +-->
   <input-modules>
-    <component-instance logger="core.modules.input" name="defaults"     
-      class="org.apache.cocoon.components.modules.input.DefaultsModule">
+    <component-instance name="defaults"
+                        class="org.apache.cocoon.components.modules.input.DefaultsModule">
       <values>
         <skin>defaultSkin</skin>
         <base-url>http://localhost:8080/cocoon</base-url>
       </values>
     </component-instance>
-    <component-instance logger="core.modules.input" name="myxml"        
-      class="org.apache.cocoon.components.modules.input.XMLFileModule">
+    <component-instance name="myxml"
+                        class="org.apache.cocoon.components.modules.input.XMLFileModule">
       <file src="context://samples/modules/forrestconf.xml"/>
     </component-instance>
-    <component-instance logger="core.modules.input" name="slashdot"     
-      class="org.apache.cocoon.components.modules.input.XMLFileModule">
+    <component-instance name="slashdot"
+                        class="org.apache.cocoon.components.modules.input.XMLFileModule">
       <file src="http://slashdot.org/slashdot.rss"/>
     </component-instance>
-    <component-instance logger="core.modules.input" name="random-100-to-500" 
-      class="org.apache.cocoon.components.modules.input.RandomNumberModule">
+    <component-instance name="random-100-to-500"
+                        class="org.apache.cocoon.components.modules.input.RandomNumberModule">
       <min>100</min>
       <max>500</max>
     </component-instance>
-    <component-instance  logger="core.modules.input" name="random-5000-to-10000" 
-      class="org.apache.cocoon.components.modules.input.RandomNumberModule">
+    <component-instance name="random-5000-to-10000"
+                        class="org.apache.cocoon.components.modules.input.RandomNumberModule">
       <min>5000</min>
       <max>10000</max>
     </component-instance>