Return-Path: Delivered-To: apmail-cocoon-cvs-archive@www.apache.org Received: (qmail 78858 invoked from network); 28 Sep 2006 14:50:39 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 28 Sep 2006 14:50:38 -0000 Received: (qmail 81734 invoked by uid 500); 28 Sep 2006 14:50:38 -0000 Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org Received: (qmail 81669 invoked by uid 500); 28 Sep 2006 14:50:37 -0000 Mailing-List: contact cvs-help@cocoon.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@cocoon.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list cvs@cocoon.apache.org Received: (qmail 81658 invoked by uid 99); 28 Sep 2006 14:50:37 -0000 Received: from idunn.apache.osuosl.org (HELO idunn.apache.osuosl.org) (140.211.166.84) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 28 Sep 2006 07:50:37 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=5.0 tests=ALL_TRUSTED,NO_REAL_NAME Received: from [140.211.166.113] ([140.211.166.113:57062] helo=eris.apache.org) by idunn.apache.osuosl.org (ecelerity 2.1.1.8 r(12930)) with ESMTP id 13/82-17533-C31EB154 for ; Thu, 28 Sep 2006 07:50:36 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 02E0F1A981A; Thu, 28 Sep 2006 07:50:34 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r450878 - in /cocoon/trunk: blocks/cocoon-core-samples-main/cocoon-core-samples-main-sample/src/main/java/org/apache/cocoon/core/container/spring/ blocks/cocoon-core-samples-main/cocoon-core-samples-main-sample/src/main/java/org/apache/coco... Date: Thu, 28 Sep 2006 14:50:33 -0000 To: cvs@cocoon.apache.org From: cziegeler@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20060928145034.02E0F1A981A@eris.apache.org> X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: cziegeler Date: Thu Sep 28 07:50:32 2006 New Revision: 450878 URL: http://svn.apache.org/viewvc?view=rev&rev=450878 Log: Move Spring sample to sample block Added: cocoon/trunk/blocks/cocoon-core-samples-main/cocoon-core-samples-main-sample/src/main/java/org/apache/cocoon/core/container/spring/test/ cocoon/trunk/blocks/cocoon-core-samples-main/cocoon-core-samples-main-sample/src/main/java/org/apache/cocoon/core/container/spring/test/TestBean.java - copied, changed from r450873, cocoon/trunk/blocks/cocoon-core-samples-main/cocoon-core-samples-main-sample/src/main/java/org/apache/cocoon/core/container/spring/TestBean.java cocoon/trunk/blocks/cocoon-core-samples-main/cocoon-core-samples-main-sample/src/main/resources/COB-INF/spring/config/spring/applicationContext.xml - copied, changed from r450875, cocoon/trunk/blocks/cocoon-core-samples-main/cocoon-core-samples-main-sample/src/main/resources/COB-INF/spring/config/applicationContext.xml Removed: cocoon/trunk/blocks/cocoon-core-samples-main/cocoon-core-samples-main-sample/src/main/java/org/apache/cocoon/core/container/spring/TestBean.java cocoon/trunk/blocks/cocoon-core-samples-main/cocoon-core-samples-main-sample/src/main/resources/COB-INF/spring/config/applicationContext.xml Modified: cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/CocoonTestCase.java Copied: cocoon/trunk/blocks/cocoon-core-samples-main/cocoon-core-samples-main-sample/src/main/java/org/apache/cocoon/core/container/spring/test/TestBean.java (from r450873, cocoon/trunk/blocks/cocoon-core-samples-main/cocoon-core-samples-main-sample/src/main/java/org/apache/cocoon/core/container/spring/TestBean.java) URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-samples-main/cocoon-core-samples-main-sample/src/main/java/org/apache/cocoon/core/container/spring/test/TestBean.java?view=diff&rev=450878&p1=cocoon/trunk/blocks/cocoon-core-samples-main/cocoon-core-samples-main-sample/src/main/java/org/apache/cocoon/core/container/spring/TestBean.java&r1=450873&p2=cocoon/trunk/blocks/cocoon-core-samples-main/cocoon-core-samples-main-sample/src/main/java/org/apache/cocoon/core/container/spring/test/TestBean.java&r2=450878 ============================================================================== --- cocoon/trunk/blocks/cocoon-core-samples-main/cocoon-core-samples-main-sample/src/main/java/org/apache/cocoon/core/container/spring/TestBean.java (original) +++ cocoon/trunk/blocks/cocoon-core-samples-main/cocoon-core-samples-main-sample/src/main/java/org/apache/cocoon/core/container/spring/test/TestBean.java Thu Sep 28 07:50:32 2006 @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.cocoon.core.container.spring; +package org.apache.cocoon.core.container.spring.test; import org.apache.cocoon.configuration.Settings; Copied: cocoon/trunk/blocks/cocoon-core-samples-main/cocoon-core-samples-main-sample/src/main/resources/COB-INF/spring/config/spring/applicationContext.xml (from r450875, cocoon/trunk/blocks/cocoon-core-samples-main/cocoon-core-samples-main-sample/src/main/resources/COB-INF/spring/config/applicationContext.xml) URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-samples-main/cocoon-core-samples-main-sample/src/main/resources/COB-INF/spring/config/spring/applicationContext.xml?view=diff&rev=450878&p1=cocoon/trunk/blocks/cocoon-core-samples-main/cocoon-core-samples-main-sample/src/main/resources/COB-INF/spring/config/applicationContext.xml&r1=450875&p2=cocoon/trunk/blocks/cocoon-core-samples-main/cocoon-core-samples-main-sample/src/main/resources/COB-INF/spring/config/spring/applicationContext.xml&r2=450878 ============================================================================== --- cocoon/trunk/blocks/cocoon-core-samples-main/cocoon-core-samples-main-sample/src/main/resources/COB-INF/spring/config/applicationContext.xml (original) +++ cocoon/trunk/blocks/cocoon-core-samples-main/cocoon-core-samples-main-sample/src/main/resources/COB-INF/spring/config/spring/applicationContext.xml Thu Sep 28 07:50:32 2006 @@ -21,11 +21,11 @@ - + Modified: cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/CocoonTestCase.java URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/CocoonTestCase.java?view=diff&rev=450878&r1=450877&r2=450878 ============================================================================== --- cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/CocoonTestCase.java (original) +++ cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/CocoonTestCase.java Thu Sep 28 07:50:32 2006 @@ -40,7 +40,7 @@ public abstract class CocoonTestCase extends ContainerTestCase { /** - * @see org.apache.cocoon.core.container.ContainerTestCase#addComponents(org.apache.cocoon.core.container.spring.CocoonXmlWebApplicationContext) + * @see org.apache.cocoon.core.container.ContainerTestCase#addComponents(org.apache.cocoon.core.container.spring.test.CocoonXmlWebApplicationContext) */ protected void addComponents(ConfigurationInfo info) throws Exception {